From: Joakim Verona <joakim@verona.se>
Date: Tue, 27 Aug 2013 02:56:46 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5a3ec8917482d3187ab187bf0b5dc15f0fc1bb63;p=emacs.git

merge from trunk
---

5a3ec8917482d3187ab187bf0b5dc15f0fc1bb63